GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD &&
!GDK_WINDOW_DESTROYED (window))
{
- RECT client_rect;
- POINT point;
-
- GetClientRect (msg->hwnd, &client_rect);
- point.x = client_rect.left; /* always 0 */
- point.y = client_rect.top;
- /* top level windows need screen coords */
- if (gdk_window_get_parent (window) == _gdk_root)
- {
- ClientToScreen (msg->hwnd, &point);
- point.x += _gdk_offset_x;
- point.y += _gdk_offset_y;
- }
-
- GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) window)->impl)->width = client_rect.right - client_rect.left;
- GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) window)->impl)->height = client_rect.bottom - client_rect.top;
-
- ((GdkWindowObject *) window)->x = point.x;
- ((GdkWindowObject *) window)->y = point.y;
-
if (((GdkWindowObject *) window)->event_mask & GDK_STRUCTURE_MASK)
{
- GdkEvent *event = gdk_event_new (GDK_CONFIGURE);
-
- event->configure.window = window;
-
- event->configure.width = client_rect.right - client_rect.left;
- event->configure.height = client_rect.bottom - client_rect.top;
-
- event->configure.x = point.x;
- event->configure.y = point.y;
-
if (((GdkWindowObject *) window)->resize_count > 1)
((GdkWindowObject *) window)->resize_count -= 1;
-#if 0 /* I don't like calling _gdk_event_func() from here, isn't there
- * a risk of getting events processed in the wrong order, like
- * Owen says in the discussion of bug #99540?
- */
- fixup_event (event);
- if (_gdk_event_func)
- (*_gdk_event_func) (event, _gdk_event_data);
- gdk_event_free (event);
-#else /* Calling append_event() is slower, but guarantees that events won't
- * get reordered, I think.
- */
- append_event (event);
-#endif
+ handle_configure_event (msg, window);
/* Dispatch main loop - to realize resizes... */
handle_stuff_while_moving_or_resizing ();
case WM_SIZING:
GetWindowRect (GDK_WINDOW_HWND (window), &rect);
+ drag = (RECT *) msg->lParam;
GDK_NOTE (EVENTS, g_print (" %s curr:%s drag:%s",
(msg->wParam == WMSZ_BOTTOM ? "BOTTOM" :
(msg->wParam == WMSZ_BOTTOMLEFT ? "BOTTOMLEFT" :
(msg->wParam == WMSZ_BOTTOMRIGHT ? "BOTTOMRIGHT" :
"???")))))))),
_gdk_win32_rect_to_string (&rect),
- _gdk_win32_rect_to_string ((RECT *) msg->lParam)));
+ _gdk_win32_rect_to_string (drag)));
impl = GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) window)->impl);
- drag = (RECT *) msg->lParam;
orig_drag = *drag;
if (impl->hint_flags & GDK_HINT_RESIZE_INC)
{
+ GDK_NOTE (EVENTS, g_print (" (RESIZE_INC)"));
if (impl->hint_flags & GDK_HINT_BASE_SIZE)
{
/* Resize in increments relative to the base size */
if (drag->bottom == rect.bottom)
break;
adjust_drag (&drag->bottom, rect.bottom, impl->hints.height_inc);
-
break;
case WMSZ_BOTTOMLEFT:
{
*ret_valp = TRUE;
return_val = TRUE;
- GDK_NOTE (EVENTS, g_print (" (handled RESIZE_INC: drag:%s)",
+ GDK_NOTE (EVENTS, g_print (" (handled RESIZE_INC: %s)",
_gdk_win32_rect_to_string (drag)));
}
}
if (impl->hint_flags & GDK_HINT_ASPECT)
{
- gdouble drag_aspect = (gdouble) (drag->right - drag->left) / (drag->bottom - drag->top);
-
- GDK_NOTE (EVENTS, g_print (" (aspect:%g)", drag_aspect));
- if (drag_aspect < impl->hints.min_aspect ||
- drag_aspect > impl->hints.max_aspect)
+ RECT decorated_rect;
+ RECT undecorated_drag;
+ int decoration_width, decoration_height;
+ gdouble drag_aspect;
+ int drag_width, drag_height, new_width, new_height;
+
+ GetClientRect (GDK_WINDOW_HWND (window), &rect);
+ decorated_rect = rect;
+ _gdk_win32_adjust_client_rect (window, &decorated_rect);
+
+ /* Set undecorated_drag to the client area being dragged
+ * out, in screen coordinates.
+ */
+ undecorated_drag = *drag;
+ undecorated_drag.left -= decorated_rect.left - rect.left;
+ undecorated_drag.right -= decorated_rect.right - rect.right;
+ undecorated_drag.top -= decorated_rect.top - rect.top;
+ undecorated_drag.bottom -= decorated_rect.bottom - rect.bottom;
+
+ decoration_width = (decorated_rect.right - decorated_rect.left) - (rect.right - rect.left);
+ decoration_height = (decorated_rect.bottom - decorated_rect.top) - (rect.bottom - rect.top);
+
+ drag_width = undecorated_drag.right - undecorated_drag.left;
+ drag_height = undecorated_drag.bottom - undecorated_drag.top;
+
+ drag_aspect = (gdouble) drag_width / drag_height;
+
+ GDK_NOTE (EVENTS, g_print (" (ASPECT:%g--%g curr: %g)",
+ impl->hints.min_aspect, impl->hints.max_aspect, drag_aspect));
+
+ if (drag_aspect < impl->hints.min_aspect)
{
- *drag = rect;
- *ret_valp = TRUE;
- return_val = TRUE;
- GDK_NOTE (EVENTS, g_print (" (handled ASPECT: drag:%s)",
- _gdk_win32_rect_to_string (drag)));
+ /* Aspect is getting too narrow */
+ switch (msg->wParam)
+ {
+ case WMSZ_BOTTOM:
+ case WMSZ_TOP:
+ /* User drags top or bottom edge outward. Keep height, increase width. */
+ new_width = impl->hints.min_aspect * drag_height;
+ drag->left -= (new_width - drag_width) / 2;
+ drag->right = drag->left + new_width + decoration_width;
+ break;
+ case WMSZ_BOTTOMLEFT:
+ case WMSZ_BOTTOMRIGHT:
+ /* User drags bottom-left or bottom-right corner down. Adjust height. */
+ new_height = drag_width / impl->hints.min_aspect;
+ drag->bottom = drag->top + new_height + decoration_height;
+ break;
+ case WMSZ_LEFT:
+ case WMSZ_RIGHT:
+ /* User drags left or right edge inward. Decrease height */
+ new_height = drag_width / impl->hints.min_aspect;
+ drag->top += (drag_height - new_height) / 2;
+ drag->bottom = drag->top + new_height + decoration_height;
+ break;
+ case WMSZ_TOPLEFT:
+ case WMSZ_TOPRIGHT:
+ /* User drags top-left or top-right corner up. Adjust height. */
+ new_height = drag_width / impl->hints.min_aspect;
+ drag->top = drag->bottom - new_height - decoration_height;
+ }
}
+ else if (drag_aspect > impl->hints.max_aspect)
+ {
+ /* Aspect is getting too wide */
+ switch (msg->wParam)
+ {
+ case WMSZ_BOTTOM:
+ case WMSZ_TOP:
+ /* User drags top or bottom edge inward. Decrease width. */
+ new_width = impl->hints.max_aspect * drag_height;
+ drag->left += (drag_width - new_width) / 2;
+ drag->right = drag->left + new_width + decoration_width;
+ break;
+ case WMSZ_BOTTOMLEFT:
+ case WMSZ_TOPLEFT:
+ /* User drags bottom-left or top-left corner left. Adjust width. */
+ new_width = impl->hints.max_aspect * drag_height;
+ drag->left = drag->right - new_width - decoration_width;
+ break;
+ case WMSZ_BOTTOMRIGHT:
+ case WMSZ_TOPRIGHT:
+ /* User drags bottom-right or top-right corner right. Adjust width. */
+ new_width = impl->hints.max_aspect * drag_height;
+ drag->right = drag->left + new_width + decoration_width;
+ break;
+ case WMSZ_LEFT:
+ case WMSZ_RIGHT:
+ /* User drags left or right edge outward. Increase height. */
+ new_height = drag_width / impl->hints.max_aspect;
+ drag->top -= (new_height - drag_height) / 2;
+ drag->bottom = drag->top + new_height + decoration_height;
+ break;
+ }
+ }
+ *ret_valp = TRUE;
+ return_val = TRUE;
+ GDK_NOTE (EVENTS, g_print (" (handled ASPECT: %s)",
+ _gdk_win32_rect_to_string (drag)));
}
break;
projects / gtk4.git / commitdiff